tests: Avoid deprecated API usage in testsocket
authorCarlos Garnacho <carlosg@gnome.org>
Thu, 28 Jan 2016 11:46:07 +0000 (12:46 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Thu, 28 Jan 2016 11:50:50 +0000 (12:50 +0100)
We can use seat grabs here.

tests/testsocket.c

index c1b59c1ef2f89d8a152fe7c2245d96eb8e6afc34..b250f10729857349c691612852c678a499f16628 100644 (file)
@@ -281,29 +281,23 @@ grab_window_toggled (GtkToggleButton *button,
                     GtkWidget       *widget)
 {
   GdkDevice *device = gtk_get_current_event_device ();
-
-  if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
-    device = gdk_device_get_associated_device (device);
+  GdkSeat *seat = gdk_device_get_seat (device);
 
   if (gtk_toggle_button_get_active (button))
     {
       int status;
 
-      status = gdk_device_grab (device,
-                                gtk_widget_get_window (widget),
-                                GDK_OWNERSHIP_NONE,
-                                FALSE,
-                                GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
-                                NULL,
-                                GDK_CURRENT_TIME);
+      status = gdk_seat_grab (seat, gtk_widget_get_window (widget),
+                              GDK_SEAT_CAPABILITY_KEYBOARD,
+                              FALSE, NULL, NULL, NULL, NULL);
 
       if (status != GDK_GRAB_SUCCESS)
        g_warning ("Could not grab keyboard!  (%s)", grab_string (status));
 
-    } 
-  else 
+    }
+  else
     {
-      gdk_device_ungrab (device, GDK_CURRENT_TIME);
+      gdk_seat_ungrab (seat);
     }
 }